@@ -1,3 +1,5 @@  | 
            ||
| 1 | 
                +# -*- coding: utf-8 -*-  | 
            |
| 2 | 
                +  | 
            |
| 1 | 3 | 
                from django.conf.urls import include, url  | 
            
| 2 | 4 | 
                 | 
            
| 3 | 5 | 
                from api.activity import contribution_admin_views  | 
            
                @@ -1,3 +1,5 @@  | 
            ||
| 1 | 
                +# -*- coding: utf-8 -*-  | 
            |
| 2 | 
                +  | 
            |
| 1 | 3 | 
                from django.db import transaction  | 
            
| 2 | 4 | 
                from django_query import get_query_value  | 
            
| 3 | 5 | 
                from django_response import response  | 
            
                @@ -39,15 +39,14 @@ def get_signed_contribtion_contract_file_api(request, administrator):  | 
            ||
| 39 | 39 | 
                @check_admin  | 
            
| 40 | 40 | 
                def start_contribution_contract_sign_api(request, administrator):  | 
            
| 41 | 41 | 
                     user_id = request.POST.get('user_id', '')
               | 
            
| 42 | 
                -    lensman_id = request.POST.get('lensman_id', '')
               | 
            |
| 43 | 42 | 
                     activity_id = request.POST.get('activity_id', '')
               | 
            
| 44 | 43 | 
                     contribution_id = request.POST.get('contribution_id', '')
               | 
            
| 45 | 44 | 
                 | 
            
| 46 | 
                - lensman = LensmanInfo.objects.get(lensman_id=lensman_id)  | 
            |
| 45 | 
                + lensman = LensmanInfo.objects.get(user_id=user_id)  | 
            |
| 47 | 46 | 
                 | 
            
| 48 | 47 | 
                contract, _ = LensmanContributionContractInfo.objects.update_or_create(  | 
            
| 49 | 48 | 
                user_id=user_id,  | 
            
| 50 | 
                - lensman_id=lensman_id,  | 
            |
| 49 | 
                + lensman_id=lensman.lensman_id,  | 
            |
| 51 | 50 | 
                activity_id=activity_id,  | 
            
| 52 | 51 | 
                contribution_id=contribution_id,  | 
            
| 53 | 52 | 
                )  | 
            
                @@ -66,4 +65,4 @@ def start_contribution_contract_sign_api(request, administrator):  | 
            ||
| 66 | 65 | 
                # 发起签署流程  | 
            
| 67 | 66 | 
                flow_status = contract_mp_views.start_contribution_contract_flow(flow_id)  | 
            
| 68 | 67 | 
                 | 
            
| 69 | 
                -    return response(200, 'Start Contribution Contract Sign Success', '发起投稿授权书签署成功', data={})
               | 
            |
| 68 | 
                +    return response(200, 'Start Contribution Contract Sign Success', u'发起投稿授权书签署成功', data={})
               | 
            
                @@ -392,5 +392,4 @@ urlpatterns += [  | 
            ||
| 392 | 392 | 
                # 会员活动模块  | 
            
| 393 | 393 | 
                urlpatterns += [  | 
            
| 394 | 394 | 
                     url(r'', include(('api.activity.activity_urls', 'activity'), namespace='activity')),
               | 
            
| 395 | 
                -  | 
            |
| 396 | 395 | 
                ]  |